Merge patch fixing child process wait on GNU/Hurd.

diff --cc debian/.git-dpm
index 1cf47d047096c3b6fb3e680ef8d57b4b154ab846,0000000000000000000000000000000000000000..74738fa81ba938fea7969bdc8e0ef47bf892d680
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- cba6a1f885d1e357fa92d36312dbc760b507082f
- cba6a1f885d1e357fa92d36312dbc760b507082f
 +# see git-dpm(1) from git-dpm package
++7eaf227281e7c35cd09405ef3f94a4eeced22882
++7eaf227281e7c35cd09405ef3f94a4eeced22882
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +emacs23_23.3+1.orig.tar.bz2
 +80b3822579eddfc120641c5a181eb0b5c7a0667d
 +23065394

diff --cc debian/patches/0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..86bccedd0d041c270cd6db3e859c1c78fbb9e4ed
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch
@@@ -1,0 -1,0 +1,32 @@@
++From 7eaf227281e7c35cd09405ef3f94a4eeced22882 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 10 Apr 2011 10:03:45 -0500
++Subject: Expect 0 from kill() for zombies on GNU/Hurd.
++
++Emacs should no longer hang while waiting for child processes on GNU/Hurd.
++
++Author: Samuel Thibault <sthibault@debian.org>
++Date: Mon, 31 Jan 2011 01:13:35 +0100
++Applied-By: Rob Browning <rlb@defaultvalue.org>
++Forwarded: bug-gnu-emacs@gnu.org
++Closes: #611591
++---
++ src/sysdep.c |    2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/src/sysdep.c b/src/sysdep.c
++index 1fbc061..3abb43f 100644
++--- a/src/sysdep.c
+++++ b/src/sysdep.c
++@@ -411,7 +411,7 @@ wait_for_termination (pid)
++   while (1)
++     {
++ #ifdef subprocesses
++-#if defined (BSD_SYSTEM) || defined (HPUX)
+++#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__)
++       /* Note that kill returns -1 even if the process is just a zombie now.
++       But inevitably a SIGCHLD interrupt should be generated
++       and child_sig will do wait3 and make the process go away. */
++-- 
++1.7.4.1
++

diff --cc debian/patches/series
index 96c36af9bc922faf3040b89f0b8032eb93582963,0000000000000000000000000000000000000000..d4d852e962fd117f6619678d619f9c73564cce3a
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,13 @@@
 +0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch
 +0006-Avoid-silently-losing-mail-via-fakemail.patch
 +0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
 +0011-Don-t-clear-FONTCONFIG_LIBS-and-FONTCONFIG_CFLAGS-in.patch
 +0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
++0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch